bitkeeper revision 1.1159.258.99 (42641f67D11Zf7wIb-qAVu9io6tamQ)

[PATCH] IO-APIC in drivers/pci/quirks.c

This patch moves the IO-APIC include inside #ifdef CONFIG_X86_IO_APIC , which
is how Linux 2.6 has it. This is needed for architectures without
asm/io_apic.h. I've verified that x86 still builds; please apply.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
===== xen/drivers/pci/quirks.c 1.9 vs edited =====

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 14fc0992aed9d14dc42089dcd35bbdc7f4e9ea80..f5ca0d0fc923fd7c2227f98df32bbc83e0a049a7 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,6 +20,7 @@ djm@kirby.fc.hp.com
 doogie@brainfood.com
 gm281@boulderdash.cl.cam.ac.uk
 gm281@tetrapod.cl.cam.ac.uk
+hollisb@us.ibm.com
 iap10@freefall.cl.cam.ac.uk
 iap10@labyrinth.cl.cam.ac.uk
 iap10@nidd.cl.cam.ac.uk

diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c
index 71c0bb428d3d176658a1f1df5ef9e070d8860603..25de96ba44a17491befadbbdee24664557a182bb 100644 (file)
--- a/xen/drivers/pci/quirks.c
+++ b/xen/drivers/pci/quirks.c
@@ -18,7 +18,6 @@
 #include <xen/pci.h>
 #include <xen/init.h>
 #include <xen/delay.h>
-#include <asm/io_apic.h>
 
 #undef DEBUG
 
@@ -333,6 +332,8 @@ static void __init quirk_vt82c686_acpi(struct pci_dev *dev)
 
 #ifdef CONFIG_X86_IO_APIC 
 
+#include <asm/io_apic.h>
+
 /*
  * VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
  * devices to the external APIC.